* .gitattributes: Ignore blanks at EOL in texinfo.tex.

diff --git a/.gitattributes b/.gitattributes
index c568ba293da4cc3944007eba921fe297f23456e5..c3bbf664ceb184faaed1aff7f63ab6c66f77ec28 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,6 +27,9 @@ leim/MISC-DIC/pinyin.map -whitespace
 lib-src/update-game-score.exe.manifest -whitespace
 nt/nmake.defs -whitespace
 
+# The upstream maintainer does not want to remove trailing whitespace.
+doc/misc/texinfo.tex -whitespace=blank-at-eol
+
 # Some files should not be treated as text when diffing or merging.
 *.gpg binary
 *.gz binary

diff --git a/ChangeLog b/ChangeLog
index d7fd76cd3057f9bc17dc5f6d49bb9e348fff13c7..ca9f44aacf7e475dd82ca25731406b339f552ca7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * .gitattributes: Ignore blanks at EOL in texinfo.tex.
+
 2015-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib and try to repair bad merge